Skip to content

Fix merge conflicts to merge change from #5080 #8911

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 5 commits into from
Jul 31, 2023
Merged

Fix merge conflicts to merge change from #5080 #8911

merged 5 commits into from
Jul 31, 2023

Conversation

tianyizheng02
Copy link
Contributor

Describe your change:

Fixed merge conflicts from #5080

  • Add an algorithm?
  • Fix a bug or typo in an existing algorithm?
  • Documentation change?

Checklist:

  • I have read CONTRIBUTING.md.
  • This pull request is all my own work -- I have not plagiarized.
  • I know that pull requests will not be merged if they fail the automated tests.
  • This PR only changes one algorithm file. To ease review, please open separate PRs for separate algorithms.
  • All new Python files are placed inside an existing directory.
  • All filenames are in all lowercase characters with no spaces or dashes.
  • All functions and variable names follow Python naming conventions.
  • All function parameters and return values are annotated with Python type hints.
  • All functions have doctests that pass the automated testing.
  • All new algorithms include at least one URL that points to Wikipedia or another similar explanation.
  • If this pull request resolves one or more open issues then the description above includes the issue number(s) with a closing keyword: "Fixes #ISSUE-NUMBER".

@tianyizheng02 tianyizheng02 mentioned this pull request Jul 31, 2023
Closed
14 tasks
@tianyizheng02 tianyizheng02 enabled auto-merge (squash) July 31, 2023 01:56
@tianyizheng02 tianyizheng02 requested a review from cclauss July 31, 2023 01:57
@tianyizheng02 tianyizheng02 merged commit 629eb86 into TheAlgorithms:master Jul 31, 2023
sedatguzelsemme pushed a commit to sedatguzelsemme/Python that referenced this pull request Sep 15, 2024
@tianyizheng02 @hugofolloni @sedatguzelsemme
Fix merge conflicts to merge change from TheAlgorithms#5080 (TheAlgor…
7b006dc 
…ithms#8911)

* Input for user choose his Collatz sequence

Now the user can tell the algorithm what number he wants to run on the Collatz Sequence.

* updating DIRECTORY.md

---------

Co-authored-by: Hugo Folloni <[email protected]>
Co-authored-by: github-actions <${GITHUB_ACTOR}@users.noreply.github.com>
@isidroas isidroas mentioned this pull request Jan 25, 2025
Closed
14 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cclauss cclauss cclauss approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@tianyizheng02 @cclauss @hugofolloni